Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Diff assets against their revision on origin/develop #54

Merged

Conversation

TheEmidee
Copy link
Contributor

@TheEmidee TheEmidee commented Aug 4, 2022

This PR adds a context menu extension in the content browser to allow to diff several assets against their counterparts on origin/develop

This is useful in a gitflow workflow for example

@mastercoms
Copy link
Member

Could you instead use status branch functionality for this? Get status branches and get the last element.

@TheEmidee
Copy link
Contributor Author

@mastercoms yes sure. I'll be in holiday for 2 weeks starting this weekend. I'll do that when I'm back

@mastercoms
Copy link
Member

Are you still planning to do the status branch changes?

haptx-peyton added a commit to haptx-peyton/UEGitPlugin that referenced this pull request Mar 23, 2023
@TheEmidee
Copy link
Contributor Author

Hi !

Sorry I completely forgot about that PR.

I've just updated the code to generate as many context menu items as there are status branches registered in the source control provider

the first status branch is always up to date with all other branches due to automatic merging, and any content out of date on other branches will be unable to modify anyway, so they should check the latest version available across all branches (which is going to be on the first status branch)
Copy link
Member

@mastercoms mastercoms left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please resolve conflicts with the reformat done on the utils header. Then also for the menu entries, I would prefer that you localize the part without the branch name and then format the branch name in.

@mastercoms mastercoms merged commit 882ec44 into ProjectBorealis:release Jun 11, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants